updated for win32 msvc build (forgot this before)

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 0b85814f0d941860200deff79ad8cf3f7a864c7f..0eb45ddb8cc24d7e32b0731da5ef50da13c7f528 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -928,7 +928,8 @@ gdk_win32_draw_image (GdkDrawable     *drawable,
 
   hdc = gdk_win32_hdc_get (drawable, gc, 0);
 
-  if (colormap_private && colormap_private->xcolormap->rc_palette)
+  if (image->visual->type == GDK_VISUAL_PSEUDO_COLOR &&
+         colormap_private && colormap_private->xcolormap->rc_palette)
     {
       if (!bmi_inited)
        {

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 946e35a691d6133f06d75acd45ebdc73d0713002..6a7decd64a5b89f1d098df5b86fd421ed9033c7d 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -23,12 +23,10 @@
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 8364b5cad14396da9af1c036a20054535ae42d10..5f7fff262906179aed5bfe0b3a4dbbdc5c9539b0 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 
+#include "gdk.h" /* gdk_rectangle_intersect */
 #include "gdkevents.h"
 #include "gdkpixmap.h"
 #include "gdkwindow.h"